Cleanup files ported over'