Finishing sync adapter and category filter. Cleaned up unused code