Deleting Trashy code, almost everything doxygenated