Removing some dead code...
Style