Removing more code

Wheeeee