Fixed find message
Removed old stuff