Mass Clean up + Ready for V3.7 Release