Restored from previous unwanted commit
Removed unused math files