Cleaned up comments and removed some disabled lines no longer needed.