20141119 - Cleaning up from issue list