Reverted some unwanted features