Committing old removals
Adding stylisitc updates