Remove hard coded ids