Had to remove uniform classes (not implemented)