Slim down code to just core library