Clean_up

Cleaned up redundant or deprecated code