fix bugs.
remove unused file.