fixed possible null ref error
added cleans prop to remove action