Removed SBCL specifics as well