Removed comments issues