Removed old code. Added comments.