removed everything not needed at the moment