removed more unnecessary stuff