Revert Some features and fixes