Further stripping away unnecessary annotations