[Work in progress: making removal work, still not working]