remove prefix stuff for now