Heroku updates
Remove selector
Remove pylint warning R0901