reverting some more unnecessary changes