removed and moved some debug drawing