Clean up to be added to main project