Redundant structural type removed; merged two source files