Cleaning up not used stuff