Added remove/list key functions