Deleted Troublesome Files
Removed Remnants of Old Metric System
Merge Fixes