Feature/bin routes cleanup