Cleaned up custom parts.