Removing more useless stuff