Removed hard coded selector