Removed another redundant function & cleaned up death code a little.