Annotate
Remove methods no longer needed
Remove NULL check when ordering
Remove unused columns