Removed commented code, deleted extra files