Fix some bugs and remove \OCP\Avatar for now