Removed everything related to comments