just a little cleaning up, removing cyclus:: qualifier and removing extraneous header includes