Most notably fix calling a non-static method statically but also remove comment that clearly came in by copy & paste,