Removing suite name as feature