cleanup and simplified build
cleanup