Removed more unused code..