Remove comments for resolved issues and added methods