Remove old code, rename map loading functions