cleaned up code (got rid of old stuff)