Removed non unit tested code from designer tool