More improvements.
removed unwanted file.