Removed comments support