cleaning up mikegrb's mess