spring cleaning

got rid of legacy files, cleaned up indentation