1. Remove unsed code