Even more code cleaned up