Remove old layout classes