Modified remove command to be general purpose.
Updated todo list