further cleanup to avoid confusion about build_path and friends + some cleanup