Removed user references, fixed locations