Removed stuff for the tests to pass