Removed unnecessary layer of design.