got rid of all that dumb shit

hopefully it doesn't  fuck things up.