Revert "First complete commit of code for:"

This reverts commit 4b86c9c262e71ab8f788ede4f49cd5b5567e8350.