Be gone! :P Some more cleanup, this place is a mess :)