Removed unnecessary @Support annotations on implementations