Iteration 5 dev code pro fixes

Removes all the violations