remove duplicate code, add 'quit and delete movie'-option (experts only), move import...