Removed stuff from figuring out bugs