Cleanup and Removed the unstable code