removed tweaks which caused perfomance lost