Clean up and remove more functions