Removed ID getters from remove function