Clean code to remove unused code
Remove some unused code