Commented out unused code from Kingens commit.