Code cleanup. Removed unused sections.
Cleaned up dates.