remove bigger and slower code