Fixed bugs due to the performance issues
Removed unwanted file