Removed utility files, with custom matrices