Wiping some unused code