Reverted some useless changes