Removed reflection stuff & other ill-behaved things.