Depreciated some old stuff & code