Getting rid of hank-a-jank functions.