Cleaned up after project 16