Removed ugly tricks