* Added Search file
* Started cleaning server code
** removing some debug logging
** removing commented out code/methods