removed some unnecessary cpp cruft