Remove hard set requirements