clean-up Executable some more