small tweaks for usability and removing TC as it won't work in production