Removing un-needed things