Remove stuff that wasn't really meant to go in