Cleanup on handling tileset model, added tileset removal