Removed warnings and unnecessary code from last commit