Remove unwanted code
Implemented search command and remove "display" command