WIP: remove function instead of auto remove on hide