Removed stuff that was breaking stuff :)