Removed some comments. Still waiting for the big rewrite to happen :)