removed unnesecary stuff