Really get rid of recursive structure this time
Clarify meaning of param
Remove un-needed file