cleanup from old layout