20141121 - Cleaning up from issue list