Removing some invalid stuff