Clean of unused code