Clean up remaining things