Removing some things that could cause trouble