removed dev code from master