devcode backup

removed some cargo-cult code; changed some design