Simplify code a little. Remove some whacky stuff.