Removed defunct functions