Major code deletion to account for new interface