Cleaned up everything from old stuff