Removed accidentally merged code