COMMENTS, removed some requires and unneeded code