Removing common structures. Closes #29