Remove development hack