Removed extraneous functions