Removed some extraneous fxns.