remove obsolete import
sort the comments by date, cleanup the code