removed data structures