Major file cleanup