thin core, removed additional classes