Comments+NoLSB in calculation

there are still LSB definitions in the file which we can get rid of but keeping there for compilation for now.