Removing status check