Code (unused use) clean up