Fix broken find command
Finish rewrite, cleanup