Fixed redundant naming scheme
Removed files not removed in last commit