Cleaned up from applying patches