Removed unused code and coment.