Removed unclass to address part of #26