Remove a bunch of non-gramework related code. More to go