Minor cleanup
Warning fixes and cleanup
Minor fixes and optimizations
Unused method removed