simplified build, removed warnings