Removed comments (Also, new code from upstream being pushed.)