Fixed issue with mixed and some cleanup