UPDATE remove unnecessary comments and imports