Removed Functions

This is the commit where I drop the separate Remove-* functions.