clean up folder ; remove old options cleanup ; change method name