Removes over engineering