Removed account check