fixed annotations and removed unused code