Started implementing remove; minor changes to other files