Cleaned code.
Removed useless code.