Removing annotation stubs

Related to #31