code cleanup, removed get-prefix