cleanup unused code, return annotation fixed