Did some trimming, depreciated some code.