removed some stuff for production only bit for now