Revert "some extra fixes"

This reverts commit 5a01c586ff7c21cb00d996501e68c04777a3a494.
extra fixes