Remove unused headers & functions