Cleaning debris

Getting rid of legacy portions of the code