Cleanup: There was some duplicate code