code removal. Not read for primetime yet