Fixing a few bugs.
Fix parameter removal