Remove hard reference to User