Cleaned up code

Removed unused and unreachable code.