Fixed Bugs and Removed Excess Files

Removed files backed up by committer in case of issues.
Fixed bug from file removal