moar cleanup, too much file cruftiness