Further cleanup / simplification]