fixing bad config, take out feature, move origin