Fixes the duplicate method and clean up some commented code