Gettign close to release - param, less clean up
More file clean up