Removed unused key property and comments. Closes #16