Removed dead code & Hlinted.