Implemented FORGE-805 - tidy up