stripped out more superfluous build system stuff