Cleanup and remove extras