Removing superfluous code.
Fixing silly mistakes.