Remove unused service
Re-arrange loading order