Simplify first time setup procedure