deleted stuff we won't need+fixes