Item removal working, but selector can be improved