[Jorge/Cassie] Remove unused code