Remove useless reference
Use remote categories
Merge branch 'firebase'