reverted some unnecessary stuff