cleaned up extraneous methods