Removed a couple of silly functions.