final cleanup, fixed faulty commit