ajs-bootstrap fix and cleanup