Removed some redundant and dead code