Cleaned up old stuff