Removed old code from CSC