Removal fix
Read later refactor