Cleanup + bugfix if using alias records