Some stuff wasn't needed