Fixed bug causing empty params after removal

Closes #16
Closes #18