Remove redundant parts in previous commit