Cleaned the untested logic from the master branch.