Removal of placeholder comments/cleanup.