Removed some extraneous function cruft