General code cleanup

I removed unused directives and a couple of redundant items (commas,
semi-colon, etc.).
Merge fix
Merge branch 'engstrom-develop' into develop

closes $379