Removed stuff I don't need - actually this time