Removing unnecessary complexity