Clean up and refit to latest framework improvements