Simplication completed; need to clean up;