Sorry, removing things unrelated to last commit