Code annotation cleanup