Cleaned up the code. Removed commented out or unused/dead sections of
the code.