cleaned up extranious crap