removed unused code, add missed annotations