Clean up
Removed dead code
Initial support for evaluation based operators in parameters according to issue #98