Cleanned last remains of old layout