Cleaned some unnecessary stuff