removed old codes. Clean up