Clean up, allow prefix overrides