Clean up and remove unused