Removed dependancy on comment module #2