more work to cleanup build system