deleted a few things and moved things to the core lib