Clean up and commented out future functionalities