Clean up mostly