fixed cleanup :D