Cleanup to line 4500 (approximately)
* Removed unused variable assignments
* Cleaned whitespace
* Cleaned comment blocks