Removed sphinx warnings and clean-up

Change-Id: I9d6ba9c48403b0b41e5d84f41d525a80b754c98a