removing the horn-schunck stuff, back to a clean master code