remove unused using and clear up source code