Removed some unused features and added acouple of comments.