cleaned up dev and debug code