Removed unecessary code.
Highlighted problems.