Fixed issue with removal of custom actions