Better repositories and filters registrations, removed unused code