removed more unnecessary functions