removed everything unnecessary