Added check for matching instance user id and general cleanup