cleaned up patches