Removed warnings and commented out code