Remove debugging
Use parameters instead of specialized builds.