Removed more unused functions