Cleaned up patches