Removal of Whack From Main Branch