Clear some unused & old methods