Utility rework, removed more files