Reconfigured selection activity and removed unused bloat code.