More shifting and cleanup