optimized

stuff removed