removed dynamo model from search model

also did some cleaning in both files