Removed tests temporarily, and comments from code