Removed matts stuff from main