Removing extra comments and docs