Fix Commit

Undo previous undesired and incorrect commits