Feature remove entry

Needs some work before being finished, but it is ready for now.