got rid of some stuff this time