Started to remove some stuff