Removing un-used logging assertions, cleaning up code a bit

--HG--
extra : rebase_source : b33df814cf243667f84034b35c069b77ffc25054
Big refactor, add param class

--HG--
extra : rebase_source : ddeda381d387286835047ff9e8dd87540dfad307