restucturing, removing dead code
more destructive development