Removed unused selector. Added some TODOs