Small cleanup. Started removing hard coded IDs