Removed old plugin codes