Remove skip code outside of function