Got rid of the type markers