Removed more un-needed procedures