Removed unused using and useless comments