Fixed small issues, also added trunks for REMOVE-* functions