Dropped Conditions

Removed conditions, see Issue #46