Fix unused warning
Apply javadoc marker correctly, it will place the javadocs above any annotations that are present.
Also fixed the remapping so that everything gets remapped correctly!