cleanup, everything works now