initial code cleanup, imports reorganized, missing @overrides added, call to deprecated api's removed