cleaned some stuff up, got rid of old code