Cleaned up lots of commented out old code in the src files